Merged from trunk
authorJason Rumney <jasonr@gnu.org>
Thu, 21 Jan 2010 15:43:05 +0000 (23:43 +0800)
committerJason Rumney <jasonr@gnu.org>
Thu, 21 Jan 2010 15:43:05 +0000 (23:43 +0800)

Trivial merge